Merge tag 'upstream/2.3.1' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 27 Jan 2015 13:54:34 +0000 (15:54 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 27 Jan 2015 13:54:34 +0000 (15:54 +0200)
commit60ca4b7ec04e0f52ed7e6901168820fa99626788
tree29b1fb373eb8135a86219ccc4ac07525f4f0b996
parente384b3478198c2912fb1b131b5dffb4c921a2346
parenta7ee2f482cf64b08b5e8d7a6c7497a6f591bc3ec
Merge tag 'upstream/2.3.1' into experimental

Upstream version 2.3.1

Conflicts:
widgets/qt.cpp
CMakeLists.txt
widgets/qt.cpp.orig